Merge branch 'master' into 'master'
authorAnton Gladky <gladk@debian.org>
Sun, 13 Dec 2020 11:53:21 +0000 (11:53 +0000)
committerAnton Gladky <gladk@debian.org>
Sun, 13 Dec 2020 11:53:21 +0000 (11:53 +0000)
commite125cd7185ec5f659333904c6271a4279eb61d27
tree834399e9ab6cf101c56e1d84cedb7047bcf22932
parentd991a23b4cf2ac5ed93156d9dac777e7d534d023
parent06163ff5b9ac704606f9a793484939cffe0e2487
Merge branch 'master' into 'master'

Fixes and workaround for platforms where Qt uses OpenGL ES

See merge request science-team/vtk9!2